bitkeeper revision 1.1358 (4267e561Ml7gO0DQYGp9EYRUYPBDHA)

Merge burn.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into burn.cl.cam.ac.uk:/local/scratch-1/maf46/xen-unstable.bk

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/arch/x86/vmx.c
index d244ed162e0ee5c9714a20f8e233a04ee2af4f61,fdece6851210cf138896cce16210caf1297daedb..880b2ce5a04f4c8553f88880127116fbfd6706f9
--- 1/xen/arch/x86/vmx.c
--- 2/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@@ -718,10 -468,10 +721,8 @@@ static int mov_to_cr(int gp, int cr, st
               */
              VMX_DBG_LOG(DBG_LEVEL_VMMU, "Update CR3 value = %lx, mfn = %lx", 
                      d->arch.arch_vmx.cpu_cr3, mfn);
-             /* undo the get_page done in the para virt case */
-             put_page_and_type(&frame_table[old_base_mfn]);
          } else {
              if ((value & X86_CR0_PE) == 0) {
 -              unsigned long eip;
 -
                __vmread(GUEST_EIP, &eip);
                  VMX_DBG_LOG(DBG_LEVEL_1,
                        "Disabling CR0.PE at %%eip 0x%lx", eip);